Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship>
Wed, 14 Apr 2010 14:49:40 +0000 (14:49 +0000)
committerKatsumi Yamaoka <katsumi@flagship>
Wed, 14 Apr 2010 14:49:40 +0000 (14:49 +0000)

Trivial merge